Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge fix #3

Merged
merged 125 commits into from
Nov 11, 2024
Merged

Merge fix #3

merged 125 commits into from
Nov 11, 2024

Conversation

sindreborsheim
Copy link
Collaborator

Fixes

This pull request fixes

Description

Type of change

  • Bugfix
  • New feature (non-breaking change which adds functionality)
  • Enhancement of existing functionality
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Impacted Areas in Application

  • Frontend
  • API
  • WITSML
  • Other (please describe)

Checklist:

Communication

  • I have made corresponding changes to the documentation
  • PR affects application security

Code quality

  • I have self-reviewed my code
  • No new warnings are generated

Test coverage

  • New code is covered by passing tests

Further comments

lindsve and others added 30 commits April 4, 2024 09:13
@lindsve
Updated to .NET 8 (equinor#2293)
60c0b0c
@janmarius
FIX-2341 Add NoWarn for NuGet warning NU1507 (equinor#2342)
d82d0a6
@janmarius
FIX-2343 Add Directory.Packages.props to Dockerfile-api (equinor#2344)
057d1fe
@eliasbruvik
FIX-2337 Improve cancel button style (equinor#2338)
b092d05
@janmarius
Revert "FIX-2341 Add NoWarn for NuGet warning NU1507" (equinor#2345)
820e0e7
@janmarius
Revert "Revert "FIX-2341 Add NoWarn for NuGet warning NU1507"" (equin…
d58f1e0 
…or#2346)
@steinsiv @snyk-bot @eliasbruvik
[Snyk] Security upgrade vite from 5.2.3 to 5.2.8 (equinor#2339)
3659117 
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Elias Bruvik <[email protected]>
@lindsve
Add OpenTelemetry library and expose metrics for Witsml requests (equ…
50c22e6 
…inor#2291)
@eliasbruvik
Fix 2350 Live wellbore filter bug (equinor#2351)
1d785a2
@vaclavbasniar
Features/1955 consistent copy mnemonic (equinor#2340)
44d1373
@janmarius @eliasbruvik
FIX-2335 Upgrade Material UI (equinor#2354)
fa8d13f 
Co-authored-by: Elias Bruvik <[email protected]>
@eliasbruvik @janmarius
FIX-2194 Witsml Explorer Desktop (equinor#2357)
43a2bae 
Co-authored-by: Jan-Marius Vatle (Omega AS) <[email protected]>
@eliasbruvik
FIX-2369 Only pack relevant files in the desktop app (equinor#2370)
bb786e1
@eliasbruvik
FIX-2368 Handle async getBaseUrl in NotificationService (equinor#2371)
9b93943
@janmarius
FIX-2366 Desktop Edition unfinished jobs warning message on close (eq…
ca3fc12 
…uinor#2373)
@eliasbruvik
FIX-2352 Add HTTP documentation (equinor#2375)
429d279
@eliasbruvik
FIX-2364 Use new logo (equinor#2374)
882e3d5
@eliasbruvik
FIX-2359 Disable interactive tooltip (equinor#2376)
c94bd4d
@eliasbruvik
FIX-2367 Automatic testing of the Desktop App (equinor#2372)
b7ad640
@janmarius
FIX-2365 WEx Desktop Edition release workflow (equinor#2381)
32bcf89
@janmarius
FIX-2382 Add write permissions to release desktop workflow (equinor#2384
85ddea6 
)
@eliasbruvik
FIX-2362 Handle front page fetch error (equinor#2377)
a0f9e6d
@eliasbruvik
FIX-2378 Implement column filter (equinor#2380)
6ac6a63
@eliasbruvik
FIX-2361 Support multiple windows in desktop app (equinor#2388)
f100d0f
@janmarius
FIX-2389 Add semantic versioning and release notes for desktop edition (
6db31fe 
equinor#2390)
@janmarius
FIX-2386 Add compare log data header (equinor#2391)
31a00b9
@eliasbruvik
FIX-2385 Run desktop tests on windows (equinor#2392)
4ad4b1b
@janmarius
FIX-2387 Exclude unshared mnemonics when comparing log data (equinor#…
3ea8818 
…2393)
@eliasbruvik
FIX-2394 Update beta version tag (equinor#2395)
3d6d48c
@eliasbruvik
FIX-2396 Remove automatic release notes (equinor#2397)
833665b
eliasbruvik and others added 28 commits August 23, 2024 14:49
@eliasbruvik
Video fix (equinor#2531)
d02b540
@eliasbruvik
Video fix (equinor#2532)
1861258
@eliasbruvik
FIX-2540 Import LAS - Depth Logs (equinor#2541)
bf5d04d
@robertbasti
Global log curve priority (equinor#2544)
46b175d
@robertbasti
Database should be designed to prevent of duplicate prioritized log c…
2503924 
…urves (equinor#2546)
@eliasbruvik
Add more demo videos (equinor#2547)
244c36a
@eliasbruvik
update readme (equinor#2549)
69b5f0b
@eliasbruvik
Bump desktop version (equinor#2550)
5092c18
@robertbasti
Unit tests for universal priority curves equinor#2545 (equinor#2548)
f34d0b3
@robertbasti
Cascade deletes well (equinor#2556)
c0bd0db
@robertbasti
Incorrect URL when opening a log from the depth overview table🐛 equin…
4250d4a 
…or#2552 (equinor#2555)
@matusmlichsk
Eslint v8.* to v9.* flat-configuration update with depending packages (…
010251f 
…equinor#2566)
@robertbasti
Package 'System.Runtime.Caching' 8.0.0 high severity vulnerability (e…
3c587ad 
…quinor#2570)
@matusmlichsk
Real compact UI mode feature (equinor#2569)
e9bf55a
@LibNik
2486 log object duplication (equinor#2572)
2f86cda
@robertbasti
Import LAS files equinor#1999 (equinor#2564)
c1809d0
@robertbasti
Object Duplication equinor#2574 (equinor#2575)
f56f66e
@eliasbruvik
FIX-2485 Query data grid (equinor#2577)
98b0643
@robertbasti
Add documentation on the URL structure for deeplinking📘 equinor#2553 (e…
56b20d3 
…quinor#2578)
@robertbasti
Download log options more clear (equinor#2579)
6d61e37
@eliasbruvik
FIX-2582 Fix wellbore creation bug (equinor#2583)
78c23b8
@eliasbruvik
FIX-2580 Fix server casing problem (equinor#2585)
c466b3f
@robertbasti
Import Log LAS Data - replace space with underscore (equinor#2584)
ab45b5e
@robertbasti
Query View - Enable the Options In field for DeleteFromStore 🐛 equino…
8a4684b 
…r#2538 (equinor#2587)
@eliasbruvik
FIX-2589 Add object count for the result in the query view (equinor#2591
abd56cb 
)
@eliasbruvik
FIX-2496 Rework log file download (equinor#2590)
f091129
@sindreborsheim
Merge remote-tracking branch 'upstream/main' into merge-fix
4f5dcfa
@sindreborsheim
update workflow
192cd09
@sindreborsheim sindreborsheim merged commit 5b6b514 into main Nov 11, 2024
3 checks passed
@sindreborsheim sindreborsheim deleted the merge-fix branch November 11, 2024 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@sindreborsheim @lindsve @janmarius @eliasbruvik @steinsiv @vaclavbasniar @robertbasti @marmid74 @matusmlichsk @LibNik